do not scroll on copy. Bug #329604.

2006-08-22  Paolo Borelli  <pborelli@katamail.com>

	* gtk/gtktextview.c: do not scroll on copy. Bug #329604.

diff --git a/ChangeLog b/ChangeLog
index 52342f0e544150b43a48126c6b9160d7ea17fe9d..f7f7b09e18bc7f7dfa6fe0a4e42630f45586d2d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-22  Paolo Borelli  <pborelli@katamail.com>
+
+       * gtk/gtktextview.c: do not scroll on copy. Bug #329604.
+
 2006-08-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkrecentchooser.c (gtk_recent_chooser_get_uris): Behave as

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 52342f0e544150b43a48126c6b9160d7ea17fe9d..f7f7b09e18bc7f7dfa6fe0a4e42630f45586d2d3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2006-08-22  Paolo Borelli  <pborelli@katamail.com>
+
+       * gtk/gtktextview.c: do not scroll on copy. Bug #329604.
+
 2006-08-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkrecentchooser.c (gtk_recent_chooser_get_uris): Behave as

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index fa2986eeb1e3e537bf1d12916cba0294d05f87b6..402b99f05e1c873886ebf8111fffab360c998bff 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -5230,8 +5230,7 @@ gtk_text_view_backspace (GtkTextView *text_view)
 
   gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
                                     &insert,
-                                    gtk_text_buffer_get_mark (get_buffer (text_view),
-                                                              "insert"));
+                                    gtk_text_buffer_get_insert (get_buffer (text_view)));
 
   if (gtk_text_buffer_backspace (get_buffer (text_view), &insert,
                                 TRUE, text_view->editable))
@@ -5239,7 +5238,7 @@ gtk_text_view_backspace (GtkTextView *text_view)
       gtk_text_view_set_virtual_cursor_pos (text_view, -1, -1);
       DV(g_print (G_STRLOC": scrolling onscreen\n"));
       gtk_text_view_scroll_mark_onscreen (text_view,
-                                         gtk_text_buffer_get_mark (get_buffer (text_view), "insert"));
+                                          gtk_text_buffer_get_insert (get_buffer (text_view)));
     }
 }
 
@@ -5254,8 +5253,7 @@ gtk_text_view_cut_clipboard (GtkTextView *text_view)
                                 text_view->editable);
   DV(g_print (G_STRLOC": scrolling onscreen\n"));
   gtk_text_view_scroll_mark_onscreen (text_view,
-                                      gtk_text_buffer_get_mark (get_buffer (text_view),
-                                                                "insert"));
+                                      gtk_text_buffer_get_insert (get_buffer (text_view)));
 }
 
 static void
@@ -5266,10 +5264,8 @@ gtk_text_view_copy_clipboard (GtkTextView *text_view)
   
   gtk_text_buffer_copy_clipboard (get_buffer (text_view),
                                  clipboard);
-  DV(g_print (G_STRLOC": scrolling onscreen\n"));
-  gtk_text_view_scroll_mark_onscreen (text_view,
-                                      gtk_text_buffer_get_mark (get_buffer (text_view),
-                                                                "insert"));
+
+  /* on copy do not scroll, we are already onscreen */
 }
 
 static void
@@ -5284,8 +5280,7 @@ gtk_text_view_paste_clipboard (GtkTextView *text_view)
                                   text_view->editable);
   DV(g_print (G_STRLOC": scrolling onscreen\n"));
   gtk_text_view_scroll_mark_onscreen (text_view,
-                                      gtk_text_buffer_get_mark (get_buffer (text_view),
-                                                                "insert"));
+                                      gtk_text_buffer_get_insert (get_buffer (text_view)));
 }
 
 static void